packages/solid-router/src/RouterProvider.tsx (1)

33-41: Avoid potential breaking change: let Wrap access router context; also tighten typing and prefer nullish coalescing.

Currently, Wrap is rendered outside the router context provider, which prevents Wrap from calling useRouter. Invert the order so Wrap still wraps all children (including pending fallbacks) while retaining access to router context. Also, explicitly type the wrapper to “accepts children” and use “??” over “||”.

-  const OptionalWrapper = router.options.Wrap || SafeFragment
+  const OptionalWrapper =
+    (router.options.Wrap ?? SafeFragment) as Solid.Component<{
+      children?: Solid.JSX.Element
+    }>

-  return (
-    <OptionalWrapper>
-      <routerContext.Provider value={router as AnyRouter}>
-        {children()}
-      </routerContext.Provider>
-    </OptionalWrapper>
-  )
+  return (
+    <routerContext.Provider value={router as AnyRouter}>
+      <OptionalWrapper>{children()}</OptionalWrapper>
+    </routerContext.Provider>
+  )

Action: Please confirm there are no known Wrap implementations relying on useRouter; if there are, the above change is necessary to avoid a regression. If not, consider documenting that Wrap must not read router context.

packages/solid-router/src/Matches.tsx (2)

47-62: InnerWrap placement is correct; small typing/coalescing tweak suggested.

Great fix—placing InnerWrap outside Suspense ensures defaultPendingComponent inherits the context. Suggest minor type and “??” coalescing adjustment for robustness.

-  const OptionalWrapper = router.options.InnerWrap || SafeFragment
+  const OptionalWrapper =
+    (router.options.InnerWrap ?? SafeFragment) as Solid.Component<{
+      children?: Solid.JSX.Element
+    }>

---

51-56: Optional rendering micro-tweak.

Using a JSX element for defaultPendingComponent is fine. If you want slightly clearer intent and avoid creating the element when undefined, Dynamic also works:

-        fallback={
-          router.options.defaultPendingComponent ? (
-            <router.options.defaultPendingComponent />
-          ) : null
-        }
+        fallback={
+          router.options.defaultPendingComponent ? (
+            <Solid.Dynamic component={router.options.defaultPendingComponent} />
+          ) : null
+        }

packages/solid-router/tests/RouterProvider.test.tsx (1)

1-37: Test clearly validates Wrap context propagation; tiny readability nit.

Consider declaring ctx before defining the component to reduce cognitive load when reading the closure.

-    const rootRoute = createRootRoute({
+    const ctx = createContext<string>()
+    const rootRoute = createRootRoute({
       component: () => {
         const contextValue = useContext(ctx)
         expect(contextValue, 'Context is not provided').not.toBeUndefined()

         return <div>{contextValue}</div>
       },
     })
@@
-    const ctx = createContext<string>()
-
     render(() => (
       <RouterProvider
         router={router}
         Wrap={(props) => {
           return <ctx.Provider value={'findMe'}>{props.children}</ctx.Provider>
         }}
       />
     ))

packages/solid-router/tests/Matches.test.tsx (3)

34-37: Remove stray console.log from tests.

This can add noise to CI output.

-  console.log('Matchse', matches())

---

129-161: Good coverage for InnerWrap → route components; rename local “screen” to avoid shadowing import.

Shadowing the imported screen with the render result is confusing.

-  const screen = render(() => (
+  const app = render(() => (
@@
-  const indexElem = await screen.findByText('context-for-children')
+  const indexElem = await app.findByText('context-for-children')

---

163-223: Good coverage for InnerWrap → defaultPendingComponent; avoid shadowing and consider fake timers.

• Rename local screen as above.
• Optional: use vi.useFakeTimers() and advanceTimersByTime(300) to reduce flakiness from real timers.

-  const screen = render(() => (
+  const app = render(() => (
@@
-  const linkToHome = await screen.findByRole('link', {
+  const linkToHome = await app.findByRole('link', {
@@
-  const indexElem = await screen.findByText('context-for-default-pending')
+  const indexElem = await app.findByText('context-for-default-pending')

If you want to switch to fake timers:

import { vi } from 'vitest'

// inside test
vi.useFakeTimers()
...
fireEvent.click(linkToHome)
vi.advanceTimersByTime(300)
...
vi.useRealTimers()

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

💡 Knowledge Base configuration:

• MCP integration is disabled by default for public repositories
• Jira integration is disabled by default for public repositories
• Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.